Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrates adjudication of questions on L2 via the zkEVM bridge #98

Merged
merged 7 commits into from
Nov 28, 2023

Conversation

edmundedgar
Copy link
Contributor

feature-fork-integration with the history simplified

Copy link
Collaborator

@josojo josojo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two nits... then its ready to merge

contracts/MoneyBox.sol Outdated Show resolved Hide resolved
contracts/MoneyBoxUser.sol Outdated Show resolved Hide resolved
@josojo
Copy link
Collaborator

josojo commented Nov 28, 2023

Nice, I think its ready to merge then...

My PR is also soon ready about the decoupled execution, and then you can adopt code from this PR in a separate PR.

@edmundedgar edmundedgar merged commit c6f295c into main Nov 28, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants